bitkeeper revision 1.265 (3f045be7u9RMdV4nk0DN3sjRc1rBdw)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/rac61/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/sos22/xeno.bk

diff --cc .rootkeys
Simple merge

diff --cc BitKeeper/etc/ignore
index 37a0921c572bdde56b8ab0a0d4b06c1b3fc0f17f,ddf99d02c52ab9ea8be44dc7177aa9f7a868a514..96401405cff57f54e12f72dbde6eb05d2892372e
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -1,177 -1,177 +1,10 @@@
  BitKeeper/*/*
  PENDING/*
--xen-2.4.16/common/kernel.c.old
--xen-2.4.16/common/kernel.c.ok-ish
--xen-2.4.16/size.image
--xen-2.4.16/drivers/block/ll_rw_blk.c.orig
--xen-2.4.16/drivers/ide/ide-disk.c.orig
--xen-2.4.16/drivers/ide/ide-probe.c.orig
--xen-2.4.16/drivers/ide/ide-taskfile.c.orig
--xen-2.4.16/drivers/ide/ide.c.orig
--xen-2.4.16/drivers/net/e1000/e1000.o
--xen-2.4.16/drivers/net/e1000/e1000_ethtool.o
--xen-2.4.16/drivers/net/e1000/e1000_hw.o
--xen-2.4.16/drivers/net/e1000/e1000_main.o
--xen-2.4.16/drivers/net/e1000/e1000_param.o
--xen-2.4.16/include/hypervisor-ifs/block.h.orig
--xen-2.4.16/include/xeno/blkdev.h.orig
--xen-2.4.16/include/xeno/sched.h.orig
--xenolinux-2.4.16-sparse/arch/xeno/drivers/block/Makefile.orig
--xenolinux-2.4.16-sparse/arch/xeno/drivers/block/block.c.orig
--xenolinux-2.4.16-sparse/scripts/kconfig.tk
--xen-2.4.16/foo
--xen-2.4.16/common/domain.c.smh
  URK
--tools/domain_builder/dom_builder.o
--tools/domain_builder/dom_kill.o
--tools/domain_builder/domain_builder
--tools/domain_builder/kill_domain
--xen/arch/i386/acpitable.o
--xen/arch/i386/apic.o
--xen/arch/i386/arch.o
--xen/arch/i386/boot/boot.o
--xen/arch/i386/delay.o
--xen/arch/i386/entry.o
--xen/arch/i386/extable.o
--xen/arch/i386/i387.o
--xen/arch/i386/i8259.o
--xen/arch/i386/idle0_task.o
--xen/arch/i386/io_apic.o
--xen/arch/i386/ioremap.o
--xen/arch/i386/irq.o
--xen/arch/i386/mm.o
--xen/arch/i386/mpparse.o
--xen/arch/i386/pci-dma.o
--xen/arch/i386/pci-i386.o
--xen/arch/i386/pci-irq.o
--xen/arch/i386/pci-pc.o
--xen/arch/i386/process.o
--xen/arch/i386/rwlock.o
--xen/arch/i386/setup.o
--xen/arch/i386/smp.o
--xen/arch/i386/smpboot.o
--xen/arch/i386/time.o
--xen/arch/i386/trampoline.o
--xen/arch/i386/traps.o
--xen/arch/i386/usercopy.o
--xen/common/ac_timer.o
--xen/common/block.o
--xen/common/brlock.o
--xen/common/common.o
--xen/common/dom0_ops.o
--xen/common/domain.o
--xen/common/domain_page.o
--xen/common/event.o
--xen/common/kernel.o
--xen/common/keyhandler.o
--xen/common/lib.o
--xen/common/memory.o
--xen/common/network.o
--xen/common/page_alloc.o
--xen/common/perfc.o
--xen/common/resource.o
--xen/common/schedule.o
--xen/common/slab.o
--xen/common/softirq.o
--xen/common/timer.o
--xen/common/vsprintf.o
--xen/drivers/block/blkpg.o
--xen/drivers/block/driver.o
--xen/drivers/block/elevator.o
--xen/drivers/block/genhd.o
--xen/drivers/block/ll_rw_blk.o
--xen/drivers/block/xen_block.o
--xen/drivers/char/driver.o
--xen/drivers/char/xen_kbd.o
--xen/drivers/char/xen_serial.o
--xen/drivers/ide/driver.o
--xen/drivers/ide/ide-disk.o
--xen/drivers/ide/ide-dma.o
--xen/drivers/ide/ide-features.o
--xen/drivers/ide/ide-geometry.o
--xen/drivers/ide/ide-pci.o
--xen/drivers/ide/ide-probe.o
--xen/drivers/ide/ide-taskfile.o
--xen/drivers/ide/ide-xeno.o
--xen/drivers/ide/ide.o
--xen/drivers/ide/piix.o
--xen/drivers/net/3c59x.o
--xen/drivers/net/Space.o
--xen/drivers/net/driver.o
--xen/drivers/net/e1000/e1000.o
--xen/drivers/net/e1000/e1000_ethtool.o
--xen/drivers/net/e1000/e1000_hw.o
--xen/drivers/net/e1000/e1000_main.o
--xen/drivers/net/e1000/e1000_param.o
--xen/drivers/net/ne/8390.o
--xen/drivers/net/ne/ne.o
--xen/drivers/net/ne/ne_drv.o
--xen/drivers/net/net_init.o
--xen/drivers/net/setup.o
--xen/drivers/net/tg3.o
--xen/drivers/pci/classlist.h
--xen/drivers/pci/compat.o
--xen/drivers/pci/devlist.h
--xen/drivers/pci/driver.o
--xen/drivers/pci/gen-devlist
--xen/drivers/pci/names.o
--xen/drivers/pci/pci.o
--xen/drivers/pci/quirks.o
--xen/drivers/pci/setup-res.o
--xen/drivers/scsi/aacraid/aachba.o
--xen/drivers/scsi/aacraid/aacraid.o
--xen/drivers/scsi/aacraid/commctrl.o
--xen/drivers/scsi/aacraid/comminit.o
--xen/drivers/scsi/aacraid/commsup.o
--xen/drivers/scsi/aacraid/dpcsup.o
--xen/drivers/scsi/aacraid/linit.o
--xen/drivers/scsi/aacraid/rx.o
--xen/drivers/scsi/aacraid/sa.o
--xen/drivers/scsi/constants.o
--xen/drivers/scsi/driver.o
--xen/drivers/scsi/hosts.o
--xen/drivers/scsi/scsi.o
--xen/drivers/scsi/scsi_dma.o
--xen/drivers/scsi/scsi_error.o
--xen/drivers/scsi/scsi_ioctl.o
--xen/drivers/scsi/scsi_lib.o
--xen/drivers/scsi/scsi_merge.o
--xen/drivers/scsi/scsi_proc.o
--xen/drivers/scsi/scsi_queue.o
--xen/drivers/scsi/scsi_scan.o
--xen/drivers/scsi/scsi_syms.o
--xen/drivers/scsi/scsicam.o
--xen/drivers/scsi/sd.o
--xen/image
--xen/image.gz
--xen/include/asm
--xen/include/linux
--xen/net/dev.o
--xen/net/dev_mcast.o
--xen/net/devinit.o
--xen/net/eth.o
--xen/net/network.o
--xen/net/skbuff.o
--xen/tools/elf-reloc
  tools/balloon/balloon
--xen/common/dom_mem_ops.o
--xen/common/string.o
--xen/drivers/block/xen_segment.o
--xen/drivers/cdrom/cdrom.o
--xen/drivers/cdrom/driver.o
--xen/drivers/ide/ide-cd.o
--xen/drivers/scsi/aic7xxx/aic7770.o
--xen/drivers/scsi/aic7xxx/aic7770_osm.o
--xen/drivers/scsi/aic7xxx/aic7xxx.o
--xen/drivers/scsi/aic7xxx/aic7xxx_93cx6.o
--xen/drivers/scsi/aic7xxx/aic7xxx_core.o
--xen/drivers/scsi/aic7xxx/aic7xxx_osm.o
--xen/drivers/scsi/aic7xxx/aic7xxx_osm_pci.o
--xen/drivers/scsi/aic7xxx/aic7xxx_pci.o
--xen/drivers/scsi/aic7xxx/aic7xxx_proc.o
--xen/drivers/scsi/megaraid.o
--xen/image.s
--xen/include/hypervisor-ifs/hypervisor-ifs
++tools/control/.classpath
++tools/control/.project
++tools/control/build-cmdline/**
  tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/Command.class
  tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/CommandDestroy.class
  tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/CommandHelp.class
@@@ -341,6 -341,6 +174,7 @@@ tools/control/dist/docs/api/uk/ac/cam/c
  tools/control/dist/docs/empty_dir
  tools/control/dist/xenctl-0.1-dev.war
  tools/control/domctl.jar
++tools/control/eclipsebin/**
  tools/control/web/about.jsp
  tools/control/web/dom-del.jsp
  tools/control/web/dom-delr.jsp
@@@ -374,6 -374,6 +208,11 @@@ tools/control/web/vd-vdrr.js
  tools/control/web/vd-vdv.jsp
  tools/control/web/vd.jsp
  tools/control/web/xenostyle.css
++tools/control/xenctl-cmdline.jar
++tools/domain_builder/dom_builder.o
++tools/domain_builder/dom_kill.o
++tools/domain_builder/domain_builder
++tools/domain_builder/kill_domain
  tools/domctl/build/uk/ac/cam/cl/xeno/domctl/Command.class
  tools/domctl/build/uk/ac/cam/cl/xeno/domctl/CommandDestroy.class
  tools/domctl/build/uk/ac/cam/cl/xeno/domctl/CommandHelp.class
@@@ -410,11 -410,7 +249,173 @@@ tools/vdmanager/build/uk/ac/cam/cl/xeno
  tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/XML.class
  tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/XMLHelper.class
  tools/vdmanager/vdmanager.jar
++xen-2.4.16/common/domain.c.smh
++xen-2.4.16/common/kernel.c.ok-ish
++xen-2.4.16/common/kernel.c.old
++xen-2.4.16/drivers/block/ll_rw_blk.c.orig
++xen-2.4.16/drivers/ide/ide-disk.c.orig
++xen-2.4.16/drivers/ide/ide-probe.c.orig
++xen-2.4.16/drivers/ide/ide-taskfile.c.orig
++xen-2.4.16/drivers/ide/ide.c.orig
++xen-2.4.16/drivers/net/e1000/e1000.o
++xen-2.4.16/drivers/net/e1000/e1000_ethtool.o
++xen-2.4.16/drivers/net/e1000/e1000_hw.o
++xen-2.4.16/drivers/net/e1000/e1000_main.o
++xen-2.4.16/drivers/net/e1000/e1000_param.o
++xen-2.4.16/foo
++xen-2.4.16/include/hypervisor-ifs/block.h.orig
++xen-2.4.16/include/xeno/blkdev.h.orig
++xen-2.4.16/include/xeno/sched.h.orig
++xen-2.4.16/size.image
++xen/arch/i386/acpitable.o
++xen/arch/i386/apic.o
++xen/arch/i386/arch.o
++xen/arch/i386/boot/boot.o
++xen/arch/i386/delay.o
++xen/arch/i386/entry.o
++xen/arch/i386/extable.o
++xen/arch/i386/i387.o
++xen/arch/i386/i8259.o
++xen/arch/i386/idle0_task.o
++xen/arch/i386/io_apic.o
++xen/arch/i386/ioremap.o
++xen/arch/i386/irq.o
++xen/arch/i386/mm.o
++xen/arch/i386/mpparse.o
++xen/arch/i386/pci-dma.o
++xen/arch/i386/pci-i386.o
++xen/arch/i386/pci-irq.o
++xen/arch/i386/pci-pc.o
++xen/arch/i386/process.o
++xen/arch/i386/rwlock.o
++xen/arch/i386/setup.o
++xen/arch/i386/smp.o
++xen/arch/i386/smpboot.o
++xen/arch/i386/time.o
++xen/arch/i386/trampoline.o
++xen/arch/i386/traps.o
++xen/arch/i386/usercopy.o
++xen/common/ac_timer.o
++xen/common/block.o
++xen/common/brlock.o
++xen/common/common.o
++xen/common/dom0_ops.o
++xen/common/dom_mem_ops.o
++xen/common/domain.o
++xen/common/domain_page.o
++xen/common/event.o
++xen/common/kernel.o
++xen/common/keyhandler.o
++xen/common/lib.o
++xen/common/memory.o
++xen/common/network.o
++xen/common/page_alloc.o
++xen/common/perfc.o
++xen/common/resource.o
++xen/common/schedule.o
++xen/common/slab.o
++xen/common/softirq.o
++xen/common/string.o
++xen/common/timer.o
++xen/common/vsprintf.o
++xen/drivers/block/blkpg.o
++xen/drivers/block/driver.o
++xen/drivers/block/elevator.o
++xen/drivers/block/genhd.o
++xen/drivers/block/ll_rw_blk.o
++xen/drivers/block/xen_block.o
++xen/drivers/block/xen_physdisk.o
++xen/drivers/block/xen_segment.o
++xen/drivers/cdrom/cdrom.o
++xen/drivers/cdrom/driver.o
++xen/drivers/char/driver.o
++xen/drivers/char/xen_kbd.o
++xen/drivers/char/xen_serial.o
++xen/drivers/ide/driver.o
++xen/drivers/ide/ide-cd.o
++xen/drivers/ide/ide-disk.o
++xen/drivers/ide/ide-dma.o
++xen/drivers/ide/ide-features.o
++xen/drivers/ide/ide-geometry.o
++xen/drivers/ide/ide-pci.o
++xen/drivers/ide/ide-probe.o
++xen/drivers/ide/ide-taskfile.o
++xen/drivers/ide/ide-xeno.o
++xen/drivers/ide/ide.o
++xen/drivers/ide/piix.o
++xen/drivers/net/3c59x.o
++xen/drivers/net/Space.o
++xen/drivers/net/driver.o
++xen/drivers/net/e1000/e1000.o
++xen/drivers/net/e1000/e1000_ethtool.o
++xen/drivers/net/e1000/e1000_hw.o
++xen/drivers/net/e1000/e1000_main.o
++xen/drivers/net/e1000/e1000_param.o
++xen/drivers/net/ne/8390.o
++xen/drivers/net/ne/ne.o
++xen/drivers/net/ne/ne_drv.o
++xen/drivers/net/net_init.o
++xen/drivers/net/setup.o
++xen/drivers/net/tg3.o
++xen/drivers/pci/classlist.h
++xen/drivers/pci/compat.o
++xen/drivers/pci/devlist.h
++xen/drivers/pci/driver.o
++xen/drivers/pci/gen-devlist
++xen/drivers/pci/names.o
++xen/drivers/pci/pci.o
++xen/drivers/pci/quirks.o
++xen/drivers/pci/setup-res.o
++xen/drivers/scsi/aacraid/aachba.o
++xen/drivers/scsi/aacraid/aacraid.o
++xen/drivers/scsi/aacraid/commctrl.o
++xen/drivers/scsi/aacraid/comminit.o
++xen/drivers/scsi/aacraid/commsup.o
++xen/drivers/scsi/aacraid/dpcsup.o
++xen/drivers/scsi/aacraid/linit.o
++xen/drivers/scsi/aacraid/rx.o
++xen/drivers/scsi/aacraid/sa.o
++xen/drivers/scsi/aic7xxx/aic7770.o
++xen/drivers/scsi/aic7xxx/aic7770_osm.o
++xen/drivers/scsi/aic7xxx/aic7xxx.o
++xen/drivers/scsi/aic7xxx/aic7xxx_93cx6.o
++xen/drivers/scsi/aic7xxx/aic7xxx_core.o
++xen/drivers/scsi/aic7xxx/aic7xxx_osm.o
++xen/drivers/scsi/aic7xxx/aic7xxx_osm_pci.o
++xen/drivers/scsi/aic7xxx/aic7xxx_pci.o
++xen/drivers/scsi/aic7xxx/aic7xxx_proc.o
++xen/drivers/scsi/constants.o
++xen/drivers/scsi/driver.o
++xen/drivers/scsi/hosts.o
++xen/drivers/scsi/megaraid.o
++xen/drivers/scsi/scsi.o
++xen/drivers/scsi/scsi_dma.o
++xen/drivers/scsi/scsi_error.o
++xen/drivers/scsi/scsi_ioctl.o
++xen/drivers/scsi/scsi_lib.o
++xen/drivers/scsi/scsi_merge.o
++xen/drivers/scsi/scsi_proc.o
++xen/drivers/scsi/scsi_queue.o
++xen/drivers/scsi/scsi_scan.o
++xen/drivers/scsi/scsi_syms.o
++xen/drivers/scsi/scsicam.o
++xen/drivers/scsi/sd.o
++xen/image
  xen/image.dis
++xen/image.gz
++xen/image.s
++xen/include/asm
++xen/include/hypervisor-ifs/hypervisor-ifs
++xen/include/linux
  xen/include/xeno/compile.h
++xen/net/dev.o
++xen/net/dev_mcast.o
++xen/net/devinit.o
++xen/net/eth.o
++xen/net/network.o
++xen/net/skbuff.o
++xen/tools/elf-reloc
  xen/tools/figlet/figlet
- tools/control/.classpath
- tools/control/.project
- tools/control/eclipsebin/**
- tools/control/build-cmdline/**
- tools/control/xenctl-cmdline.jar
 -xen/drivers/block/xen_physdisk.o
++xenolinux-2.4.16-sparse/arch/xeno/drivers/block/Makefile.orig
++xenolinux-2.4.16-sparse/arch/xeno/drivers/block/block.c.orig
++xenolinux-2.4.16-sparse/scripts/kconfig.tk